-
Notifications
You must be signed in to change notification settings - Fork 521
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Vpnaas: Delete service #769
Conversation
Build succeeded.
|
@simonre This will need to be rebased with master when you have a moment. I did a quick glance and it looks fine, but I'll review it again once it's ready to go. Thanks again for working on this series. |
Build succeeded.
|
@jtopjian I think this is ready. I'm not too familiar with rebasing so please tell me if I did something wrong. |
Build succeeded.
|
Ah, no problem. The first thing to try would be this: $ git checkout master
$ git pull
$ git checkout vpnaas-service-delete
$ git rebase -i master You'll then be prompted with a list of commits. You want to make sure that only the commits for this PR are chosen and remove any other commits from other PRs / merges. If you want to practice, doing this should work: $ git checkout master
$ git pull
$ git checkout vpnaas-service-delete
$ git checkout -b vpnaas-service-delete-rebase-practice
$ git rebase -i master If you feel you made a mistake, you can then delete the Once you've got the $ git push -f simonre vpnaas-service-delete During the code review, we don't want branches which were forced - only if a rebase is requested (like this). Let me know if you need help and I'll rebase this on my side and provide the steps to walk you through it. |
b89ff58
to
56ef594
Compare
Build succeeded.
|
@jtopjian This should do it. Thanks for the in-depth answers and explanations. Really appreciate it! |
@simonre Yes, perfect - nice work 😄 |
For #723
Links to the line numbers/files in the OpenStack source code that support the
code in this PR:
https://github.com/openstack/neutron-vpnaas/blob/058469e1b99b647537a5228c6a384d93df5484df/neutron_vpnaas/db/vpn/vpn_db.py#L512
API:
https://developer.openstack.org/api-ref/network/v2/#remove-vpn-service